simplifications

diff --git a/test/graphemetest.c b/test/graphemetest.c
index bc55b16cf40f5612e48ea4bd22e8fc90187ff73e..25c7ddb2179528c87816fe438d81766c34b11762 100644 (file)
--- a/test/graphemetest.c
+++ b/test/graphemetest.c
@@ -1,10 +1,8 @@
 #include "tests.h"
-#include "simple_getline.h"
 
 int main(int argc, char **argv)
 {
     char buf[8192];
-    size_t bufsize = 0;
     FILE *f = argc > 1 ? fopen(argv[1], "r") : NULL;
     utf8proc_uint8_t src[1024];
     int len;

diff --git a/test/normtest.c b/test/normtest.c
index 34921bf522b778370117fd4e6927fc11e5ffa7de..40e31126432ba2c4dfdec608bc1629a66f3ae7f7 100644 (file)
--- a/test/normtest.c
+++ b/test/normtest.c
@@ -1,5 +1,4 @@
 #include "tests.h"
-#include "simple_getline.h"
 
 #define CHECK_NORM(NRM, norm, src) {                                 \
     char *src_norm = (char*) utf8proc_ ## NRM((utf8proc_uint8_t*) src);      \

diff --git a/test/simple_getline.h b/test/simple_getline.h
deleted file mode 100644 (file)
index 453cff6..0000000
--- a/test/simple_getline.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* simplistic, portable replacement for getline, sufficient for our tests */
-static size_t simple_getline(char buf[8192], FILE *f) {
-    size_t i = 0;
-    while (i < 1023) {
-        int c = getc(f);
-        if (c == EOF || c == '\n') break;
-        buf[i++] = (char) c;
-    }
-    buf[i] = 0;
-    return i;
-}

diff --git a/test/tests.c b/test/tests.c
index 0fb0da36305720b7021cec72ee3422d3f10fc5fd..8cc3119745c74b42affbcac6d12c04b58606bb8a 100644 (file)
--- a/test/tests.c
+++ b/test/tests.c
@@ -44,3 +44,15 @@ size_t encode(char *dest, const char *buf)
           d += utf8proc_encode_char(c, (utf8proc_uint8_t *) (dest + d));
      }
 }
+
+/* simplistic, portable replacement for getline, sufficient for our tests */
+size_t simple_getline(char buf[8192], FILE *f) {
+    size_t i = 0;
+    while (i < 1023) {
+        int c = getc(f);
+        if (c == EOF || c == '\n') break;
+        buf[i++] = (char) c;
+    }
+    buf[i] = 0;
+    return i;
+}

diff --git a/test/tests.h b/test/tests.h
index 1811a734a5fe929fb8edb5b2517ad3b96cef3683..8447e8694523aa3923150c96447cc341f1f337a1 100644 (file)
--- a/test/tests.h
+++ b/test/tests.h
@@ -21,3 +21,4 @@ extern size_t lineno;
 void check(int cond, const char *format, ...);
 size_t skipspaces(const char *buf, size_t i);
 size_t encode(char *dest, const char *buf);
+size_t simple_getline(char buf[8192], FILE *f);